From 189b0b72b004a6901b7b0e825f8c2ead44d7acd0 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Wed, 27 Oct 2010 20:27:04 +0000 Subject: [PATCH] changing mw.uti functionnames to follow convention + loading $.client as dependency of mw.util --- resources/Resources.php | 2 +- resources/mediawiki.util/mediawiki.util.js | 6 +++--- resources/mediawiki.util/mediawiki.util.test.js | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index cb0e1e214f..941441e995 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -381,7 +381,7 @@ return array( ) ), 'mediawiki.util' => new ResourceLoaderFileModule( array( 'scripts' => 'resources/mediawiki.util/mediawiki.util.js', - 'dependencies' => 'jquery.checkboxShiftClick', + 'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client' ), 'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js', ) ), diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js index 504a61701b..26ec9eefcd 100644 --- a/resources/mediawiki.util/mediawiki.util.js +++ b/resources/mediawiki.util/mediawiki.util.js @@ -68,7 +68,7 @@ * * @param String str string to be encoded */ - 'wikiUrlencode' : function( str ) { + 'wfUrlencode' : function( str ) { return this.rawurlencode(str).replace(/%20/g, '_').replace(/%3A/g, ':').replace(/%2F/g, '/'); }, @@ -77,8 +77,8 @@ * * @param String str pagename to link to */ - 'getWikilink' : function( str ) { - return wgServer + wgArticlePath.replace('$1', this.wikiUrlencode(str)); + 'wfGetlink' : function( str ) { + return wgServer + wgArticlePath.replace('$1', this.wfUrlencode(str)); }, /** diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js index 9db7853e6c..07a6345ad3 100644 --- a/resources/mediawiki.util/mediawiki.util.test.js +++ b/resources/mediawiki.util/mediawiki.util.test.js @@ -1,6 +1,9 @@ -/* - * mediaWiki Debug Test Suit. +/** + * mediaWiki.util Test Suit + * * Available on "/Special:BlankPage?action=mwutiltest&debug=true") + * + * @author Krinkle */ (function ($, mw) { -- 2.20.1